Skip to content
This repository has been archived by the owner on Mar 8, 2021. It is now read-only.

1.4.0 #1402

Merged
merged 711 commits into from
Jan 25, 2018
Merged

1.4.0 #1402

merged 711 commits into from
Jan 25, 2018

Conversation

Dmi3yy
Copy link
Collaborator

@Dmi3yy Dmi3yy commented Jan 25, 2018

No description provided.

64j and others added 30 commits November 7, 2017 21:02
fixed but need unicode versions adding to style/default/style.php.
style icon for stay "Save As+" toggle dropdown
fix empty trash
fix deleted/undeleted docs from context menu
fix publish/unpublish docs from context menu
[F] Use custom module icon for menu
[F] Remove insert button for module icon field
Dmi3yy and others added 29 commits January 24, 2018 12:58
[F] Update ManagerManager version number to 0.6.3
added check to index-ajax, old default themes, ajax search and eform
[I] Add confirmation dialog when updating system
Added WebLogin, WebSignup, WebChangePwd, Breadcrumbs and Reflect
added D3X from evocustm to outdated theme list
more recent version is 1.1.2 not 1.1.5
# Conflicts:
#	assets/plugins/elementsintree/includes/on_manager_tree_render.inc.php
#	assets/plugins/extrascheck/lang/english.php
#	assets/plugins/extrascheck/lang/italian.php
#	assets/plugins/qm/css/actionButtons.css
#	assets/plugins/qm/css/navButtons.css
#	assets/plugins/qm/css/style.css
#	assets/plugins/qm/qm.inc.php
#	assets/plugins/tinymce4/tinymce/langs/fr.js
#	assets/plugins/tinymce4/tpl/tpl.tinymce4.config.html
#	install/actions/tpl_connection.html
#	install/assets/plugins/OutdatedExtrasCheck.tpl
#	install/assets/plugins/qm.tpl
#	install/setup.data.sql
#	install/setup.sql
#	install/template.tpl
#	manager/actions/category_mgr/skin/main.tpl.phtml
#	manager/actions/modules.static.php
#	manager/actions/mutate_module.dynamic.php
#	manager/actions/welcome.static.php
#	manager/includes/header.inc.php
#	manager/includes/lang/english.inc.php
#	manager/includes/lang/italian.inc.php
#	manager/includes/lang/nederlands-utf8.inc.php
#	manager/includes/preload.functions.inc.php
#	manager/media/browser/mcpuk/themes/evo/style.css
#	manager/media/browser/mcpuk/tpl/tpl_browser.php
#	manager/media/style/common/spectrum/spectrum.css
#	manager/media/style/default/color.switcher.php
#	manager/media/style/default/css/color.switcher.css
#	manager/media/style/default/css/custom.css
#	manager/media/style/default/js/color.switcher.js
@Dmi3yy Dmi3yy merged commit b6ed91e into modxcms:master Jan 25, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.